migrate advanced travis build to focal. (#546)

and fix a new clazy warning.  This warning shows up on focal
with clazy 1.6, but not on eoan with clazy 1.5.

diff --git a/.travis.yml b/.travis.yml
index 10526f7ad7162079c4149f0867b9a9557cbcd21c..9ef722c303bd384dc39975c5a490545a5b325e39 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -29,7 +29,7 @@ jobs:
       compiler: gcc
       env:
         - BUILD_TYPE="docker"
-        - DOCKER_IMG="eoan"
+        - DOCKER_IMG="focal"
         - DOCKER_SCRIPT="./tools/build_extra_tests"
     - os: linux
       dist: xenial

diff --git a/tools/Dockerfile_eoan b/tools/Dockerfile_eoan
deleted file mode 100644 (file)
index 6881802..0000000
--- a/tools/Dockerfile_eoan
+++ /dev/null
@@ -1,74 +0,0 @@
-# this file is used to build the image gpsbabel_build_environment used by travis.
-
-FROM ubuntu:eoan
-
-LABEL maintainer="https://github.com/tsteven4"
-
-WORKDIR /app
-
-# update environment.
-ARG DEBIAN_FRONTEND=noninteractive
-RUN apt-get update && apt-get install -y --no-install-recommends \
-    apt-utils \
- && apt-get upgrade -y \
- && rm -rf /var/lib/apt/lists/*
-
-# install packages needed for gpsbabel build
-# split into multiple commands to limit layer size
-
-# basic build and test tools
-RUN apt-get update && apt-get install -y --no-install-recommends \
-    g++ \
-    make \
-    autoconf \
-    gperf \
-    git \
-    valgrind \
-    expat \
-    libxml2-utils \
-    bear \
-    clazy \
- && rm -rf /var/lib/apt/lists/*
-
-# alternative compiler
-RUN apt-get update && apt-get install -y --no-install-recommends \
-    clang \
- && rm -rf /var/lib/apt/lists/*
-
-# pkgs needed to build document
-RUN apt-get update && apt-get install -y --no-install-recommends \
-    fop \
-    xsltproc \
-    docbook-xml \
-    docbook-xsl \
- && rm -rf /var/lib/apt/lists/*
-
-# pkgs with libraries needed by gpsbabel
-RUN apt-get update && apt-get install -y --no-install-recommends \
-    libusb-dev \
-    libusb-1.0-0-dev \
-    pkg-config \
-    libudev-dev \
- && rm -rf /var/lib/apt/lists/*
-
-# pkgs with qt used by gpsbabel
-RUN apt-get update && apt-get install -y --no-install-recommends \
-    qt5-default \
-    qttools5-dev-tools \
-    qttranslations5-l10n \
-    qtwebengine5-dev \
- && rm -rf /var/lib/apt/lists/*
-
-# pkgs needed to generate coverage report:
-RUN apt-get update && apt-get install -y --no-install-recommends \
-    gcovr \
- && rm -rf /var/lib/apt/lists/*
-
-# install environment for locale test
-RUN apt-get update && apt-get install -y --no-install-recommends \
-    locales \
- && rm -rf /var/lib/apt/lists/* \
- && sed -i 's/^# *\(en_US ISO-8859-1\)/\1/' /etc/locale.gen \
- && locale-gen \
- && locale -a
-

diff --git a/tools/Dockerfile_focal b/tools/Dockerfile_focal
new file mode 100644 (file)
index 0000000..dcfb48a
--- /dev/null
+++ b/tools/Dockerfile_focal
@@ -0,0 +1,74 @@
+# this file is used to build the image gpsbabel_build_environment used by travis.
+
+FROM ubuntu:focal
+
+LABEL maintainer="https://github.com/tsteven4"
+
+WORKDIR /app
+
+# update environment.
+ARG DEBIAN_FRONTEND=noninteractive
+RUN apt-get update && apt-get install -y --no-install-recommends \
+    apt-utils \
+ && apt-get upgrade -y \
+ && rm -rf /var/lib/apt/lists/*
+
+# install packages needed for gpsbabel build
+# split into multiple commands to limit layer size
+
+# basic build and test tools
+RUN apt-get update && apt-get install -y --no-install-recommends \
+    g++ \
+    make \
+    autoconf \
+    gperf \
+    git \
+    valgrind \
+    expat \
+    libxml2-utils \
+    bear \
+    clazy \
+ && rm -rf /var/lib/apt/lists/*
+
+# alternative compiler
+RUN apt-get update && apt-get install -y --no-install-recommends \
+    clang \
+ && rm -rf /var/lib/apt/lists/*
+
+# pkgs needed to build document
+RUN apt-get update && apt-get install -y --no-install-recommends \
+    fop \
+    xsltproc \
+    docbook-xml \
+    docbook-xsl \
+ && rm -rf /var/lib/apt/lists/*
+
+# pkgs with libraries needed by gpsbabel
+RUN apt-get update && apt-get install -y --no-install-recommends \
+    libusb-dev \
+    libusb-1.0-0-dev \
+    pkg-config \
+    libudev-dev \
+ && rm -rf /var/lib/apt/lists/*
+
+# pkgs with qt used by gpsbabel
+RUN apt-get update && apt-get install -y --no-install-recommends \
+    qt5-default \
+    qttools5-dev-tools \
+    qttranslations5-l10n \
+    qtwebengine5-dev \
+ && rm -rf /var/lib/apt/lists/*
+
+# pkgs needed to generate coverage report:
+RUN apt-get update && apt-get install -y --no-install-recommends \
+    gcovr \
+ && rm -rf /var/lib/apt/lists/*
+
+# install environment for locale test
+RUN apt-get update && apt-get install -y --no-install-recommends \
+    locales \
+ && rm -rf /var/lib/apt/lists/* \
+ && sed -i 's/^# *\(en_US ISO-8859-1\)/\1/' /etc/locale.gen \
+ && locale-gen \
+ && locale -a
+

diff --git a/util.cc b/util.cc
index 0174ef7822959dbaab18887e66f9830c7a6397ca..b93c38d2d2520dafe6d8271b6c2e87b0694f52ac 100644 (file)
--- a/util.cc
+++ b/util.cc
@@ -1774,7 +1774,7 @@ void list_timezones()
   };
   std::sort(zoneids.begin(), zoneids.end(), alpha);
   Warning() << "Available timezones are:";
-  for (const auto& id : zoneids) {
+  for (const auto& id : qAsConst(zoneids)) {
     Warning() << id;
   }
 }